From 956bf143e8a8e41ae56f128ed7812541aa50d7d6 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 30 Sep 2009 08:51:21 +0100 Subject: [PATCH] xend: allow domain creation with multiple empty CD-ROM devices Signed-off-by: Keir Fraser --- tools/python/xen/xend/XendConfig.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py index 9c84c26c65..ac5f66c675 100644 --- a/tools/python/xen/xend/XendConfig.py +++ b/tools/python/xen/xend/XendConfig.py @@ -1202,14 +1202,14 @@ class XendConfig(dict): if o_dev_type == 'vbd' or o_dev_type == 'tap' or o_dev_type == 'tap2': blkdev_file = blkdev_uname_to_file(dev_uname) o_dev_uname = sxp.child_value(o_dev_info, 'uname') - if o_dev_uname != None: + if o_dev_uname and o_dev_uname != None: o_blkdev_file = blkdev_uname_to_file(o_dev_uname) if blkdev_file == o_blkdev_file: raise XendConfigError('The file "%s" is already used' % blkdev_file) - if dev_uname == o_dev_uname: - raise XendConfigError('The uname "%s" is already defined' % - dev_uname) + if dev_uname and dev_uname == o_dev_uname: + raise XendConfigError('The uname "%s" is already defined' % + dev_uname) o_blkdev_name = sxp.child_value(o_dev_info, 'dev') o_devid = self._blkdev_name_to_number(o_blkdev_name) if o_devid != None and devid == o_devid: -- 2.30.2